Skip to content

[podman-5.8] container storage cleanup work#1007

Open
TomSweeneyRedHat wants to merge 6 commits into
podman-container-tools:podman-5.8from
TomSweeneyRedHat:dev/tsweeney/accel-649-storage-1.62-1
Open

[podman-5.8] container storage cleanup work#1007
TomSweeneyRedHat wants to merge 6 commits into
podman-container-tools:podman-5.8from
TomSweeneyRedHat:dev/tsweeney/accel-649-storage-1.62-1

Conversation

@TomSweeneyRedHat

Copy link
Copy Markdown
Contributor

This backports a number of fixes relating to customer storage cleanup, especially noted in https://redhat.atlassian.net/browse/ACCELFIX-649

This cherry-picks from the commits from these PRs:

Fixes: https://redhat.atlassian.net/browse/RHEL-173988, https://redhat.atlassian.net/browse/RHEL-173842

Once storage is vendored into Podman v5.8-rhel

mtrmac and others added 6 commits July 21, 2026 14:53
We already have 3 users, and we will need another one.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
(cherry picked from commit 7cac518)
Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
(cherry picked from commit 4e5f9d5)
Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
- The graph driver contents are locked by layerStore's locking,
  not by the graph driver lock
- Because we dropped the layer store lock, a layer might have legitimately
  been added in the meantime; don't treat is as unaccounted.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
(cherry picked from commit 8311e6c)
Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
…c/check-refactor

Refactor `Store.Check`

(cherry picked from commit c4edeb1)
Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
I failed to push the latest version of my code in podman-container-tools#720.

Should not change behavior.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
(cherry picked from commit 0ebd8a2)
Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
As the title says.

Signed-off-by: Tom Sweeney <tsweeney@redhat.com>
@github-actions github-actions Bot added the storage Related to "storage" package label Jul 21, 2026

@Luap99 Luap99 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note we do not have the full CI running on this branch, as I did not bother backporting it here so far, I can look into it if needed.

But one thing that does run is the linter and that suggest you changes here do not compile. So please check that locally

$ go build ./storage/...
# go.podman.io/storage
storage/check.go:304:27: undefined: diffReader

But also I ado not follow the commits that have been picked, 6dc3cd5 cherry-picked the merge commit which I think is wrong, we want the original commits picked only. OR at least that is how we have been doing this in the past.

@mtrmac mtrmac left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From a literally 1-minute look, the locking fixes are probably relevant; the “Refactor Store.Check” branch/PR should be a no-op, so I think an unnecessary risk on a stable branch (if nothing else depends on that those changes).

@Luap99

Luap99 commented Jul 22, 2026

Copy link
Copy Markdown
Member

(working on some proper CI here #1010, still WIP)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

storage Related to "storage" package

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants